From: Alex Williamson <alex.williamson@hp.com>
Date: Thu, 27 Sep 2007 15:01:42 +0000 (-0600)
Subject: [IA64] Merge vmx_dispatch_itlb_miss and vmx_dispatch_dtlb_miss
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14953
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=8d59ef1a2dabadff266b3fdeac8e371a8488c38e;p=xen.git

[IA64] Merge vmx_dispatch_itlb_miss and vmx_dispatch_dtlb_miss

They were identical.

Signed-off-by: Tristan Gingold <tgingold@free.fr>
---

diff --git a/xen/arch/ia64/vmx/vmx_ivt.S b/xen/arch/ia64/vmx/vmx_ivt.S
index d2ed7fa918..68cca17c04 100644
--- a/xen/arch/ia64/vmx/vmx_ivt.S
+++ b/xen/arch/ia64/vmx/vmx_ivt.S
@@ -217,7 +217,7 @@ vmx_itlb_loop:
     ;;
 vmx_itlb_out:
     mov r19 = 1
-    br.sptk vmx_dispatch_itlb_miss
+    br.sptk vmx_dispatch_tlb_miss
     VMX_FAULT(1);
 END(vmx_itlb_miss)
 
@@ -298,7 +298,7 @@ vmx_dtlb_loop:
     ;;
 vmx_dtlb_out:
     mov r19 = 2
-    br.sptk vmx_dispatch_dtlb_miss
+    br.sptk vmx_dispatch_tlb_miss
     VMX_FAULT(2);
 END(vmx_dtlb_miss)
 
@@ -1374,7 +1374,7 @@ GLOBAL_ENTRY(vmx_dispatch_vexirq)
     br.call.sptk.many b6=vmx_vexirq
 END(vmx_dispatch_vexirq)
 
-ENTRY(vmx_dispatch_itlb_miss)
+ENTRY(vmx_dispatch_tlb_miss)
     VMX_SAVE_MIN_WITH_COVER_R19
     alloc r14=ar.pfs,0,0,3,0
     mov out0=cr.ifa
@@ -1393,29 +1393,7 @@ ENTRY(vmx_dispatch_itlb_miss)
     ;;
     adds out2=16,r12
     br.call.sptk.many b6=vmx_hpw_miss
-END(vmx_dispatch_itlb_miss)
-
-ENTRY(vmx_dispatch_dtlb_miss)
-    VMX_SAVE_MIN_WITH_COVER_R19
-    alloc r14=ar.pfs,0,0,3,0
-    mov out0=cr.ifa
-    mov out1=r15
-    adds r3=8,r2                // set up second base pointer
-    ;;
-    ssm psr.ic
-    ;;
-    srlz.i                  // guarantee that interruption collection is on
-    ;;
-    (p15) ssm psr.i               // restore psr.i
-    movl r14=ia64_leave_hypervisor_prepare
-    ;;
-    VMX_SAVE_REST
-    VMX_SAVE_EXTRA
-    mov rp=r14
-    ;;
-    adds out2=16,r12
-    br.call.sptk.many b6=vmx_hpw_miss
-END(vmx_dispatch_dtlb_miss)
+END(vmx_dispatch_tlb_miss)
 
 ENTRY(vmx_dispatch_break_fault)
     VMX_SAVE_MIN_WITH_COVER_R19